From cdc4f6a476940f20d5989c61016a15e13995bd15 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 18 Nov 2001 15:33:18 +0000 Subject: [PATCH] use g_strcasecmp(), some poor platforms don't have strcasecmp() 2001-11-18 Hans Breuer * io-xpm.c : use g_strcasecmp(), some poor platforms don't have strcasecmp() * makefile.msc : do INCLUDE_png etc. definition here to avoid my temporary 'gdk-pixbuf-io-include.h' hack --- gdk-pixbuf/ChangeLog | 8 ++++++++ gdk-pixbuf/io-xpm.c | 2 +- gdk-pixbuf/makefile.msc | 12 +++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 22a7b93c63..f6da4f82f1 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,11 @@ +2001-11-18 Hans Breuer + + * io-xpm.c : use g_strcasecmp(), some poor platforms + don't have strcasecmp() + + * makefile.msc : do INCLUDE_png etc. definition here to avoid + my temporary 'gdk-pixbuf-io-include.h' hack + Sun Nov 18 07:54:22 2001 Owen Taylor * gdk-pixbuf-loader.c: Remove include of gobject/signal.h. diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c index 583b05aad3..b18a82e640 100644 --- a/gdk-pixbuf/io-xpm.c +++ b/gdk-pixbuf/io-xpm.c @@ -898,7 +898,7 @@ static XPMColorEntry xColors[] = { static int compare_xcolor_entries (const void *a, const void *b) { - return strcasecmp ((const char *) a, ((const XPMColorEntry *) b)->name); + return g_strcasecmp ((const char *) a, ((const XPMColorEntry *) b)->name); } static gboolean diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc index 94d7040ebb..5220575b3f 100644 --- a/gdk-pixbuf/makefile.msc +++ b/gdk-pixbuf/makefile.msc @@ -11,11 +11,17 @@ PERL = perl GDK_PIXBUF_VER = 1.3 -# force inclusion of gdk-pixbuf-io-include.h -# to get _working_ include modules ... +# to get _working_ include modules we need respective defines ... +BUILT_IN_FORMATS = -DINCLUDE_png -DINCLUDE_bmp -DINCLUDE_gif \ + -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_xpm -DINCLUDE_wbmp \ + -DINCLUDE_pnm -DINCLUDE_ras + +# -DINCLUDE_tiff + + PKG_CFLAGS = -I. -I.. $(GLIB_CFLAGS) \ - -FIgdk-pixbuf-io-include.h \ + $(BUILT_IN_FORMATS) \ $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(INTL_CFLAGS) \ $(G_DEBUGGING) \ -UUSE_GMODULE # use built-in -- 2.30.2